phylib: remove a couple of redundant code lines

This change slightly improves readability of the phydev speed/duplex
assignment logic.

Signed-off-by: Vladimir Zapolskiy <[email protected]>
Acked-by: Detlev Zundel <[email protected]>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 8da7688d704e529c7869b7db682f4c03b8ecd414..833a0512ecaacdf109fe48faddea1ddac50c0206 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -318,13 +318,10 @@ static int genphy_parse_link(struct phy_device *phydev)
                lpa = phy_read(phydev, MDIO_DEVAD_NONE, MII_ADVERTISE);
                lpa &= phy_read(phydev, MDIO_DEVAD_NONE, MII_LPA);
 
-               if (lpa & (LPA_100FULL | LPA_100HALF)) {
+               if (lpa & (LPA_100FULL | LPA_100HALF))
                        phydev->speed = SPEED_100;
 
-                       if (lpa & LPA_100FULL)
-                               phydev->duplex = DUPLEX_FULL;
-
-               } else if (lpa & LPA_10FULL)
+               if (lpa & (LPA_100FULL | LPA_10FULL))
                        phydev->duplex = DUPLEX_FULL;
        } else {
                u32 bmcr = phy_read(phydev, MDIO_DEVAD_NONE, MII_BMCR);